merge trunk
authorKenichi Handa <handa@etlken>
Tue, 29 Jun 2010 02:41:29 +0000 (11:41 +0900)
committerKenichi Handa <handa@etlken>
Tue, 29 Jun 2010 02:41:29 +0000 (11:41 +0900)

Trivial merge